From 65ecf2c9fc29ea65787b48136f033995a2db52a5 Mon Sep 17 00:00:00 2001 From: robertl Date: Tue, 11 Sep 2007 21:52:26 +0000 Subject: [PATCH] Mirko makes minor changes to DG100 module. - increase RX timeout because dg100_erase() needs >20s - remove unused variables in dg100_getfileheaders() which were moved into a local code block for debugging - add more debugging output to dg100_getfileheaders() - fix loop condition in dg100_getfileheaders() --- dg-100.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dg-100.c b/dg-100.c index 187cbbf98..d6c10d682 100644 --- a/dg-100.c +++ b/dg-100.c @@ -325,8 +325,9 @@ dg100_recv_byte() { int result; - /* allow for a delay of 20s; especially erase can take a long time */ - result = gbser_readc_wait(serial_handle, 20000); + /* allow for a delay of 40s; + * eraseing the whole DG-100 memory takes about 21s */ + result = gbser_readc_wait(serial_handle, 40000); switch(result){ case gbser_ERROR: fatal("dg100_recv_byte(): error reading one byte\n"); @@ -529,8 +530,6 @@ dg100_getfileheaders(struct dynarray16 *headers) int seqnum; gbint16 numheaders, nextheader, *h; int i, offset; - //time_t ti; - //int time, date; nextheader = 0; do { @@ -541,6 +540,8 @@ dg100_getfileheaders(struct dynarray16 *headers) /* process the answer */ numheaders = be_read16(answer); nextheader = be_read16(answer + 2); + dg100_log("found %d headers, nextheader=%d\n", + numheaders, nextheader); h = dynarray16_alloc(headers, numheaders); for (i = 0; i < numheaders; i++) { @@ -555,7 +556,7 @@ dg100_getfileheaders(struct dynarray16 *headers) i, seqnum, ctime(&ti)); } } - } while (numheaders != 0); + } while (nextheader != 0); } static void -- 2.30.2